Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2011 17:28:05 +0000 (10:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2011 17:28:05 +0000 (10:28 -0700)

Trivial merge